Fixing borked tests