Refactoring specs in the same step as making code changes makes your work impossible to review.

First, make a pull request that refactors the specs *without changing behavior*. Then do a pull request to make behavior and spec changes.