Make the test helpers more correct on their own.