Merge "Delete outdated options tests"