fix tests, add guava