Minor cleanup in test code.