guava is needed at runtime.

scala needed only for test. It is already in test scope. I think the diff is messed up, and hard to read.