'todo' -> 'TODO', 'skip' -> 'SKIP'

Hi, another minor tweak for TAP testing.