Refactor several tests to use verifyOutput()