Adding a full integration test
Moving files around