Added tests for various caombinations of op calls and assignments.
Use new state var handling mechanism from Overture.