Added support for expected execution plan verification