More re-formatting of manual test files