Using Collection.empthMay instead of 'new Map()'

Updated according to suggestion on github.
Also changed one unit test to also use that method. The plain list(url) is still used by other tests.