Fix up tests.

--HG--
branch : jsonConfig
Who thought that giving Listeners the same deviceID as their parent was a good plan? *facepalm*

--HG--
branch : jsonConfig