Moved #21540 test code to crm/characteristics