Fix tests with respect to new method signature change.