Formatting cleanup in newly-decomposed tests.