Fix broken integrated tests