Fixed test 4 and test 5
fixing merge conflicts