Re-apply indenting fixes

Applied it to the test_* files, but maybe they should just be deleted