fixed tests and renamed Username to Email in User partials