Cleanup
Adapted tests to latest registry changes