refactor for addition of format tests to main suite