Logically patch the viaIR issue for running unit tests

This attempts to patch the viaIR issue (as encountered in a particular case) in a logical way (as opposed to minimally).