minor step_definition changes, further user_controller refactoring