Revert "Removed legacy junk"

This reverts commit c77537e0c73f3ad234cce54cfbd4037574209ab5.
Re-added MUnit command-line options