Added more tests and passed all of them