Fix borked tests