Update tests to reflect new options