Updated tests.
Removed options.