Tweak test names slightly
Clean up remaining references to string-based pre-tasks