[expectations] New expectations plan, fix has-moved function