cleanup option
option renames
cleaned test option