Consolidation and extended test runs

No match.