Trying to arrange unit tests in better way
Fix incompatibility to 2.3-level type resolvers