Fixed failing tests

Added a test for COUNT
Merge pull request #10 from cndreisbach/master

Fix failing tests