Fixed another test
Some tests changes