fixed some registration redirection troubles and hardcoding in tests