Remove BatchExpectation interface
Fix bug, import of the deleted BatchExpectation
Refacot Batch in order to manage one Expectation for each Statement execution