LUN-967: Fix function signatures for failing tests.