Tidying up integration tests