[WIP] Use new output type in place of TAP

Will fix #983 until we switch to busted-2.0.