More test cleanup.
Cleaned up tests.
More test cleanup.
Cleaned up OptProc code.