Undo overly simplistic attempt to allow avoidance of enclosure; add example test cases needed to pass