Clean up formatting of test files. Update previously NYI