Add missing id parameter.
Fix unit tests for latest pocket and wallet refactoring.