some tests modified