Added more tests though