Hi Tom, I have the dtoc changes ready to go but I was thinking it best to apply the driver-model updates before sending a pull request. But that is (currently) designed to set on top of the SPL test improvements...have you had a look at that one? I can probably separate them if needed. Regards, Simon