cleaning up and fixing registration tests