Rework (most) test case fixes to avoid using .value for now