updated corrigible, tests, and test resources to get ordering working as it should with both files and directives