Fix tests suit