Modified default options and test cases.