Make SKIP and TODO more verbose

Makes TAP reports more useful by allowing TODO and SKIP items to be annotated.

Also includes a small tweak to make the tests pass.