More integration test tidying-up