Tests adapted