Minor test cleanups for multiplexer