ADD Refactor to extract object registry to a new file
ADD New test definitions
ADD Refactor the tests to split the functionality