(Existence opt test-case touch up)