Make resolvers work with state object directly
Fix custom types test.