Adding Guava & testcases