21 to 7 scenarios.
Merge pull request #277 from 4950/poetter/21to7Scenarios

21 to 7 scenarios.
Extremely hard fix.