REL-2015: Code cleanup in test code.