Added UT case for ReturnCountExtended
Merge pull request #110 from KTannenberg/master

As you asked - added UT for changes