Remove wrong commit files
Fix functional tests