Added test fixes (from lsmith PR)
ensure there is a property