Fixed test cases (for real this time)