Make integration tests work

Need file organisation refactoring