c720584e49
Added a unittest to verify the necessary string returns match the actual existing classes, in case something screws up the refactoring.