fixing resolvers, tests remain failing