Merge "Add junit for HeaderUtil java"