Adding some test to the helpers and made a workaround for pavlov options.