Fix up integration tests