Added more tests for new user metrics