Adding test coverage for TODO's, but discovered more code needing
testing in UserController, TODO's added