Stream Id cannot have hypen in it + Synchronization of flow end messages for latency calculation + Updated test files