basics of the new assert method implemented
returning functionality to the new assert_props
Merge remote-tracking branch 'upstream/master'