Minor changes to test and implementation classes.