2nd attempt at fixing tests