[expectations] Refactoring
[expectations] Adapt patrol plan
[expectations] Add continual validation function