Was able to remove an inner class in FlatMapStep. Its a very simple Step now. Fixed a bug in gremlin-tests -- Fixed #345. Finalized a variable in MapStep.