Fixed mistakenly committed test options change.
Merge branch 'beforeall-afterall' into edge