Fixing tests
Following remarks