Clean up formatting.
Last fixes for test.