Minore changes to test classes.