Fix broken build with new failing tests