upgrade tests & fix clones