#28 #11 Added more tests for more compatible coordinator ctor and continued implementing the new handling logic