Fixed test cases and comments