Fix all options tests