Added more tests - passing