Clean up formatting of tests