renaming and small test fixes for users controller