Added initial aggregate testing