Add an ID to the test.
Code re-arrange.
More code shuffling for clarity.
Make a checklist of things todo.