fixed couple broken tests but still slow