Conditional formats: cleanups and more tests.