Test suite update from Larry Doolittle to disable some problematic
ambiguous cases.  Everything now passes the test suite...
2 files changed