Minor changes in test classes.