Improve options object handling and tests.
Fix internal naming to match package.