Deleting duplicate files, fixing test and restoring some infrastructure