Fix all of the tests.  This breaks the __output qualifier (which
indicates poor test coverage there...)
Fix __output qualifier and add tests.