adjust formatting in ui, test files