Updated test classes.