added coverage and support for changing CollectorOnNodeState queue length + minor changes