More test cases and DOS names capture/apply fixes