Compute termination for WHILE and UNTIL.
Added two more tests.