Handle housekeeping for class level UT patches