unable to do the error checking in resources_controller, sad path in cucumber, help
Merge branches 'master' and 'testing'