Minor code cleanup in gremlin-test.
Minor refactoring and reformatting of code in gremlin-test.
Reformatting and refactoring in gremlin-test.
Refactoring and reformatting of code in gremlin-test.