Minor beauty treatment of test code.