- More correct fix of tests