fix signature and make tests

Created by: chwarwick

I updated the signature for the aggregation count functions and tried to make some test cases for you to work with

Test plan