#724 - Small cosmetic changes to test code.