Finished unit tests and updated registration