fix of failing tests