For upstream

Second attempt to merge some test fixes, code removal and missing `IGNPAR` input mode.