fix up integration tests