Add some more unit tests for users