Attempt 2 to make tests stop failing