Fixed remaining integration tests