Added handling for a hyphen in a property name and 2 tests for it.