added add resolver and tests