fixed tests, added new resolvers, renamed some
registered new resolver