Merge pull request #1 from abramhindle/master

updated tests with proper count and accounting