integration test tweaks