Add options and tests api