Unfudges, skip -> todo and other clarifications in S06 testing