Use full processor names in tests
Add rework support