Guava fix and add test with commons