Options parameter is now optional. More unit tests for options.