Fix test cases (mockito should count the variableDescriptor variant methods)
(cherry picked from commit 3bacab588c7adea39b944ad71fc9c054fff466fb)