Add TODO about fixing the structure of our test helpers.