Remove the unimplemented check-opts. Minor refactoring of tests.