Final formatting fixes for functional test suite.