Test reworks