Anoother try to fix tests