Enhanced tests

Updated tests and fixed a few registration issues.