Changes to nicer names some test methods and classes.