Patch Set 4: I would prefer that you didn't submit this; Build Successful; IP review completed

- fixed some typos in method names
- fixed formatting

- could you integrate the new tests into maven build so that they are run from maven as well ?