Fix broken test cases after last Plugin update