Add trivial mappers for testing and fix Guava dependency.