fixes randomly failing tests review 2