Added more tests for user