Clean up source/tests formatting