Fix test cases (mockito should count the variableDescriptor variant methods)