And another pass of astyle for the test files.