Fix up tests to reflect refactored method signatures.