+ all unit tests fixed, pending restored cluster-status-test.js