Updated test collateral to take advantage of top-level mark classes.