Fixed test cases again (they should pass now)