Fixed up test cases, but still failing
All test cases are now passing