Updated tests.
Updated configuration options.