Tweaks to test output.
Typechecking done.