Cleaning the tests up
Fixed merge conflicts