Fix bug: Count is broken
* Update unit tests to reflect revert of count function behavior.
Issue#: CODE-2214


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@21059 ef53c05b-3124-4d59-ae7d-fe3273f42be7