* code cleanup
+ resolvers tests