fix test failure - and disambiguator bug