Correct the property changed bindings
Add additional test cases
Added combo test (failing)