Adding more aggregate tests