Tests corrected

Some tests corrected