Added more tests. Added any