Fix tests
fix text, and change option name & minor enhancement