Set up tests
Fixed merge conflicts