Can we clean up the tests so that we know which tests pass, and which don't. Also, for the tests that pass, we should have the necessary "golden" output in some form...
