Adding expectation capability to step impls; validation around step impl structure