Work a bit on broken tests