Fix lists and sets to use guava library rather than testNG lib