Adds a test for disjoint evaluation of assignments
Fix merge problem!