Reorder dir tests for more pleasing output