Merge pull request #65 from Doha2012/master

Modify Class GuavaCollectionTypesTest
cleanup work
java tests cleanup work
Modify class GuavaCollectionTypesTest
Merge remote-tracking branch 'upstream/master'