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

Aside from the JVM .classpath change, this looks good to me.  I'm glad you decided to reuse the tests, and the code looks a lot cleaner now.