[HPT-140] Repair nonworking feature and add test to exercise it