Fix test and deleted unused files