Fix tests and replace old tests for aggregated results.