New fix of tests