diff --git a/src/modules/video_coding/main/test/generic_codec_test.cc b/src/modules/video_coding/main/test/generic_codec_test.cc
index 7513b563a9..0a5b543a68 100644
--- a/src/modules/video_coding/main/test/generic_codec_test.cc
+++ b/src/modules/video_coding/main/test/generic_codec_test.cc
@@ -562,12 +562,14 @@ RTPSendCallback_SizeTest::AveragePayloadSize() const
 }
 
 WebRtc_Word32
-VCMEncComplete_KeyReqTest::SendData(const FrameType frameType,
-                             const WebRtc_UWord8 payloadType,
-                             const WebRtc_UWord32 timeStamp,
-                             const WebRtc_UWord8* payloadData,
-                             const WebRtc_UWord32 payloadSize,
-                             const RTPFragmentationHeader& fragmentationHeader)
+VCMEncComplete_KeyReqTest::SendData(
+        const FrameType frameType,
+        const WebRtc_UWord8 payloadType,
+        const WebRtc_UWord32 timeStamp,
+        const WebRtc_UWord8* payloadData,
+        const WebRtc_UWord32 payloadSize,
+        const RTPFragmentationHeader& fragmentationHeader,
+        const webrtc::RTPVideoTypeHeader* videoTypeHdr)
 {
     WebRtcRTPHeader rtpInfo;
     rtpInfo.header.markerBit = true; // end of frame
diff --git a/src/modules/video_coding/main/test/generic_codec_test.h b/src/modules/video_coding/main/test/generic_codec_test.h
index fa1473a037..b9802482f0 100644
--- a/src/modules/video_coding/main/test/generic_codec_test.h
+++ b/src/modules/video_coding/main/test/generic_codec_test.h
@@ -85,12 +85,14 @@ class VCMEncComplete_KeyReqTest : public webrtc::VCMPacketizationCallback
 {
 public:
     VCMEncComplete_KeyReqTest(webrtc::VideoCodingModule &vcm) : _vcm(vcm), _seqNo(0), _timeStamp(0) {}
-    WebRtc_Word32 SendData(const webrtc::FrameType frameType,
-                                 const WebRtc_UWord8 payloadType,
-                                 const WebRtc_UWord32 timeStamp,
-                                 const WebRtc_UWord8* payloadData,
-                                 const WebRtc_UWord32 payloadSize,
-                                 const webrtc::RTPFragmentationHeader& fragmentationHeader);
+    WebRtc_Word32 SendData(
+            const webrtc::FrameType frameType,
+            const WebRtc_UWord8 payloadType,
+            WebRtc_UWord32 timeStamp,
+            const WebRtc_UWord8* payloadData,
+            const WebRtc_UWord32 payloadSize,
+            const webrtc::RTPFragmentationHeader& fragmentationHeader,
+            const webrtc::RTPVideoTypeHeader* videoTypeHdr);
 private:
     webrtc::VideoCodingModule& _vcm;
     WebRtc_UWord16 _seqNo;
diff --git a/src/modules/video_coding/main/test/mt_rx_tx_test.cc b/src/modules/video_coding/main/test/mt_rx_tx_test.cc
index 8d4d782573..666030da91 100644
--- a/src/modules/video_coding/main/test/mt_rx_tx_test.cc
+++ b/src/modules/video_coding/main/test/mt_rx_tx_test.cc
@@ -47,7 +47,7 @@ MainSenderThread(void* obj)
         {
             printf ("Error when opening file \n");
             delete &waitEvent;
-            delete tmpBuffer;
+            delete [] tmpBuffer;
             return false;
         }
     }
@@ -66,14 +66,14 @@ MainSenderThread(void* obj)
         {
             printf("Add Frame error: %d\n", ret);
             delete &waitEvent;
-            delete tmpBuffer;
+            delete [] tmpBuffer;
             return false;
         }
         waitEvent.Wait(33);
     }
 
     delete &waitEvent;
-    delete tmpBuffer;
+    delete [] tmpBuffer;
 
     return true;
 }
diff --git a/src/modules/video_coding/main/test/normal_test.cc b/src/modules/video_coding/main/test/normal_test.cc
index 4d77a5cff8..e82d1ae0c0 100644
--- a/src/modules/video_coding/main/test/normal_test.cc
+++ b/src/modules/video_coding/main/test/normal_test.cc
@@ -65,12 +65,14 @@ VCMNTEncodeCompleteCallback::RegisterTransportCallback(VCMPacketizationCallback*
 }
 
 WebRtc_Word32
-VCMNTEncodeCompleteCallback::SendData(const FrameType frameType,
-                                 const WebRtc_UWord8  payloadType,
-                                 const WebRtc_UWord32 timeStamp,
-                                 const WebRtc_UWord8* payloadData,
-                                 const WebRtc_UWord32 payloadSize,
-                                 const RTPFragmentationHeader& fragmentationHeader)
+VCMNTEncodeCompleteCallback::SendData(
+        const FrameType frameType,
+        const WebRtc_UWord8  payloadType,
+        const WebRtc_UWord32 timeStamp,
+        const WebRtc_UWord8* payloadData,
+        const WebRtc_UWord32 payloadSize,
+        const RTPFragmentationHeader& fragmentationHeader,
+        const webrtc::RTPVideoTypeHeader* videoTypeHdr)
 
 {
     // will call the VCMReceiver input packet
diff --git a/src/modules/video_coding/main/test/normal_test.h b/src/modules/video_coding/main/test/normal_test.h
index 25af1743ff..7264d0ef50 100644
--- a/src/modules/video_coding/main/test/normal_test.h
+++ b/src/modules/video_coding/main/test/normal_test.h
@@ -30,11 +30,12 @@ public:
     void RegisterTransportCallback(webrtc::VCMPacketizationCallback* transport);
     // process encoded data received from the encoder, pass stream to the VCMReceiver module
     WebRtc_Word32 SendData(const webrtc::FrameType frameType,
-                                 const WebRtc_UWord8 payloadType,
-                                 const WebRtc_UWord32 timeStamp,
-                                 const WebRtc_UWord8* payloadData,
-                                 const WebRtc_UWord32 payloadSize,
-                                 const webrtc::RTPFragmentationHeader& fragmentationHeader);
+                           const WebRtc_UWord8 payloadType,
+                           const WebRtc_UWord32 timeStamp,
+                           const WebRtc_UWord8* payloadData,
+                           const WebRtc_UWord32 payloadSize,
+                           const webrtc::RTPFragmentationHeader& fragmentationHeader,
+                           const webrtc::RTPVideoTypeHeader* videoTypeHdr);
 
     // Register exisitng VCM. Currently - encode and decode with the same vcm module.
     void RegisterReceiverVCM(webrtc::VideoCodingModule *vcm);
diff --git a/src/modules/video_coding/main/test/test_util.cc b/src/modules/video_coding/main/test/test_util.cc
index d2db97f2e5..9cd3ca06c1 100644
--- a/src/modules/video_coding/main/test/test_util.cc
+++ b/src/modules/video_coding/main/test/test_util.cc
@@ -43,12 +43,14 @@ VCMEncodeCompleteCallback::RegisterTransportCallback(VCMPacketizationCallback* t
 }
 
 WebRtc_Word32
-VCMEncodeCompleteCallback::SendData(const FrameType frameType,
-                                    const WebRtc_UWord8  payloadType,
-                                    const WebRtc_UWord32 timeStamp,
-                                    const WebRtc_UWord8* payloadData,
-                                    const WebRtc_UWord32 payloadSize,
-                                    const RTPFragmentationHeader& fragmentationHeader)
+VCMEncodeCompleteCallback::SendData(
+        const FrameType frameType,
+        const WebRtc_UWord8  payloadType,
+        const WebRtc_UWord32 timeStamp,
+        const WebRtc_UWord8* payloadData,
+        const WebRtc_UWord32 payloadSize,
+        const RTPFragmentationHeader& fragmentationHeader,
+        const webrtc::RTPVideoTypeHeader* videoTypeHdr)
 {
     // will call the VCMReceiver input packet
     _frameType = frameType;
@@ -124,18 +126,26 @@ VCMEncodeCompleteCallback::ResetByteCount()
 // Packetization callback implmentation
 
 WebRtc_Word32
-VCMRTPEncodeCompleteCallback::SendData(const FrameType frameType,
-                                       const WebRtc_UWord8  payloadType,
-                                       const WebRtc_UWord32 timeStamp,
-                                       const WebRtc_UWord8* payloadData,
-                                       const WebRtc_UWord32 payloadSize,
-                                       const RTPFragmentationHeader& fragmentationHeader)
+VCMRTPEncodeCompleteCallback::SendData(
+        const FrameType frameType,
+        const WebRtc_UWord8  payloadType,
+        const WebRtc_UWord32 timeStamp,
+        const WebRtc_UWord8* payloadData,
+        const WebRtc_UWord32 payloadSize,
+        const RTPFragmentationHeader& fragmentationHeader,
+        const webrtc::RTPVideoTypeHeader* videoTypeHdr)
 {
     _frameType = frameType;
     _encodedBytes+= payloadSize;
     _encodeComplete = true;
     //printf("encoded = %d Bytes\n", payloadSize);
-    return _RTPModule->SendOutgoingData(frameType, payloadType, timeStamp, payloadData, payloadSize, &fragmentationHeader);
+    return _RTPModule->SendOutgoingData(frameType,
+                                        payloadType,
+                                        timeStamp,
+                                        payloadData,
+                                        payloadSize,
+                                        &fragmentationHeader,
+                                        videoTypeHdr);
 }
 
  float
diff --git a/src/modules/video_coding/main/test/test_util.h b/src/modules/video_coding/main/test/test_util.h
index 42b1bf1e2c..732d411cc4 100644
--- a/src/modules/video_coding/main/test/test_util.h
+++ b/src/modules/video_coding/main/test/test_util.h
@@ -74,7 +74,8 @@ public:
     WebRtc_Word32 SendData(const webrtc::FrameType frameType,
             const WebRtc_UWord8 payloadType, const WebRtc_UWord32 timeStamp,
             const WebRtc_UWord8* payloadData, const WebRtc_UWord32 payloadSize,
-            const webrtc::RTPFragmentationHeader& fragmentationHeader);
+            const webrtc::RTPFragmentationHeader& fragmentationHeader,
+            const webrtc::RTPVideoTypeHeader* videoTypeHdr);
     // Register exisitng VCM. Currently - encode and decode with the same vcm module.
     void RegisterReceiverVCM(webrtc::VideoCodingModule *vcm) { _VCMReceiver = vcm; }
     // Return size of last encoded frame encoded data (all frames in the sequence)
@@ -123,7 +124,8 @@ public:
     WebRtc_Word32 SendData(const webrtc::FrameType frameType,
             const WebRtc_UWord8 payloadType, const WebRtc_UWord32 timeStamp,
             const WebRtc_UWord8* payloadData, const WebRtc_UWord32 payloadSize,
-            const webrtc::RTPFragmentationHeader& fragmentationHeader);
+            const webrtc::RTPFragmentationHeader& fragmentationHeader,
+            const webrtc::RTPVideoTypeHeader* videoTypeHdr);
     // Return size of last encoded frame. Value good for one call
     // (resets to zero after call to inform test of frame drop)
     float EncodedBytes();