Fix : staring to fix some tests