Refactoring in test + code re: ambiguous values
First passing ambiguity test
Flesh out other failing ambiguity tests
Reorg