Refactor to remove strict callables test duplication.