refactored tests and internal code due to removing custom guava code