Added initial unit tests, for count and collect
Added peg based parser