Related to #62. Fix and test for mapped properties.