Fifth pass on #384

Remove non-options that cause the test to fail.