remove old files
fix tests