* fixed broken (removal from cluster) test
* minor refactorings