Merge "Add unit tests fir DefaultFlowEntry class"