Add nonexcl case test, comment out two others