Trying to fix broken tests