refactoring: abstract contract inference in combined analysis
fix in test data

Theses files were not deleted previously.