added tests to the users controller
resolving merge conflicts
added tests to the questions model
resolving merge conflicts