More progress on integration tests