Merge "Update aggregate tests for bug#1907775"