Rework test code a bit.
Rework test code a bit.