third fix of tests