Fix so many tests