Added more tests...for team