I hope so, but the test failure is pretty painful to dissect. The new way looks right to me, but I'm  definitely doing some more poking before I feel confident enough...