Updated test for token_and_options.
Updated CHANGELOG with token_and_options bugfix.