Updated for uniprocessor test.