update tests, and delete useless/duplicate files