Added guava jar
Added test file
Fixed merge conflicts