PERF: Updated tests.