Fixed post-merge test failure