Some tests updated