Run tagged scenarios

From rjp's pull request: merged, fixed conflicts, and all tests pass.