Add aggregate tests