Cleanup this test a bit.

Use simpler names and remove unnecessary fields.