Reorder var decls in revert test

Oh, MSVC.
Merge pull request #1984 from ethomson/revert_fix

Reorder revert test variable decls