Fixed test 2 and 3