Finished all test cases with correct grammar and if/else issue