Reinstated scope conflict tests now that the assertion code is fixed, although still not convinced by the resultant tree.