Fix option tests to match new behavior