Merged with master branch; update test suite with latest context changes.
Improved cluster initialization strategy.