This is a separate commit because changing the test at the same time as renaming it breaks git (and github) rename detection.
Russell Yanofsky