Cleanup, better naming, in test.