Added a missing unwrap to set-first.
Ensured different key comparisons in all calls to t1 tester.