Fix test and dependencies
Fix dependencies
delete old files