Better registration test

Still need to test the method, but I need sleep....