Cleaned up operator testcase some more.