All test cases should be working now