All test cases working and passing now