Clean up user registration test scenarios

Addresses #786