Some tests modified