More work on integration tests