Fixing test failures

Moved the methods to registry core since it is more generic.