Tests adapted.