Merge "add junit coverage for HeatBridgeUtils"