test: Fix ofono 1.15 merging errors