This merge extends the test suite to include more of the options allows in the configuration file, and fixes bugs discovered therein.