Cleaned imports
Added some small changed and added a test file

All registers now returns the object when created.