Major refactor of user_recoverable_spec
Major refactor of user_registrations_spec

Also minor update for user_lockable_spec