More S05 test unfudges, skip->todo and additional tests