integration test improvements