Resubmission changes: changed ENUM names, added more tests, more robust checks for incl or excl, and removed bitwise ^ to ||