Fix the test skip count for non-terminals
Release engineering for 0.42