Fixes #360
Fixes #342
Fixes #332
Changed the naming convention around uniqueness and added out-unique/no-lock as default for property keys
updated test cases according to change in TypeMaker