Tweaked names of some of the tests to match the new "Factory" names.