Some tests modifications