fix test + some libs