Some tweaks required but now works fine
This makes it possible to use the registry in test cases
Tested in simulation, seems to work, but need to re-test on hardware