Finished test 4 and 5
Fixed merge
Finished test cases 6 and 7