More tests modified