added sensible skipping of expectation sets and single expectations
Merge branch 'addSkipping' into dev