Factory fixes. Cluster acceptance tests.