Fixed test cases so they are running correctly