repair a few tests