Fix custom option tests