Work on integration tests