updated tests for user controller
merge updates
remove temporary files