Merge "Unit tests for formatting code, fix %%."