adds unit tests adds new resolvers