Aggregate tests added and code fixed