Fix organisation domain for test
Fix device registration test