Improvements in CHANGE-CLASS tests