Updating the tests to match the new API and fixing a minor bug whereby help leaked into the options.