Remove unneeded "grep | wc -l" instances

grep -c does the same in most cases
Update regression test files