Update test-count to reflect @49aed18a38

(and the preceding two commits; these added tests but did not increase the count)
Merge pull request #719 from Darael/719-test-counts

Increase the test-count to reflect changes pulled in #718