Code cleanup in test file.