avoid global polution
fixed Resolver("A") issue
stored:local tests