Adding the resolve method and the appropriate tests