Simplying/unobscuring test code.