Pushed as a trivial fix; also fixed up some invalid use of assert calls which where masking some test case problems.
Pushed as a trivial fix; also fixed up some invalid use of assert calls which where masking some test case problems.