* Adjust PortableRegistry name extraction * Adjust contract tests * Adjust * Adjust
* Move test files to correct packages * Adjust