Now we support Map/List/Set for both return and param types. Added tests and missing tests