Fixes for #1247

- unit tests
- property name and type