Ported some tests to TAP testing