Implemented set/map/list support and fixed/completed tests for map/set/l...

...ist returns