Added tests for mixed property/attribute mapping