#227 small improvement, removing constructor argument from GetterCollectionOrMapWrapper
#227 removing the new collection / map implementation from the addAll methods
#227 adding some unit test
#227 Formatting; Getting rid of some warnings