Move data check functions out of test ns, add should-check?