Revert "-Fixed bug with ambiguous match during internal unit tests"

This reverts commit b7901a53b8c52ad116d3bb871605c7164451de63.