coordination: added tests, minor logic changes