Added more test cases that should be satisfied for exercise 24