Reorder revert test variable decls

Thanks MSVC!