Added test methods for ambiguity resolvers. Refactored resolvers.