new options and update tests