diff --git a/data/test/sessionSetupReq.xml.exi b/data/test/sessionSetupReq.xml.exi
new file mode 100644
index 0000000..5436fd3
Binary files /dev/null and b/data/test/sessionSetupReq.xml.exi differ
diff --git a/data/test/sessionSetupRes.xml.exi b/data/test/sessionSetupRes.xml.exi
new file mode 100644
index 0000000..ca56267
Binary files /dev/null and b/data/test/sessionSetupRes.xml.exi differ
diff --git a/src/test/evse_serviceMethods.c b/src/test/evse_serviceMethods.c
index 1090a95..767d1d7 100644
--- a/src/test/evse_serviceMethods.c
+++ b/src/test/evse_serviceMethods.c
@@ -26,6 +26,7 @@
 #include "v2g_serviceMethods.h"
 #include "v2g_dataTypes.h"
 #include <stdio.h>
+#include <string.h>
 
 static void printBinaryArray(uint8_t* byte, uint32_t len);
 
@@ -337,7 +338,7 @@ int	chargeParameterDiscovery(struct MessageHeaderType* header, struct ChargePara
 int	powerDelivery(struct MessageHeaderType* header, struct PowerDeliveryReqType* param, struct PowerDeliveryResType* result)
 {
 
-	size_t i;
+	int i;
 
 	printf("EVSE side: powerDelivery called\n"  );
 	printf("\tReceived data:\n");
diff --git a/src/test/main.h b/src/test/main.h
index af3b001..0095cdd 100644
--- a/src/test/main.h
+++ b/src/test/main.h
@@ -29,6 +29,7 @@
 #define CODE_VERSION_EXI 1
 #define CODE_VERSION_SERVICE 2
 #define CODE_VERSION CODE_VERSION_SERVICE
+/* #define CODE_VERSION CODE_VERSION_EXI */
 
 #ifndef MAIN_H_
 #define MAIN_H_
diff --git a/src/test/main_codec.c b/src/test/main_codec.c
index 05e6d07..c3589f1 100644
--- a/src/test/main_codec.c
+++ b/src/test/main_codec.c
@@ -59,23 +59,27 @@
 #if EXI_STREAM == BYTE_ARRAY
 /* 64 kilobytes = 65 536 bytes */
 /* 1 megabyte = 1 048 576 bytes*/
-#define BUFFER_SIZE 1048576
+#define BUFFER_SIZE 256
 uint8_t bufferIn[BUFFER_SIZE];
 uint8_t bufferOut[BUFFER_SIZE];
 #endif /* EXI_STREAM == BYTE_ARRAY */
 
 /* avoids warning: initializer element is not computable at load time */
-#define ARRAY_SIZE_BYTES 300
+#define ARRAY_SIZE_BYTES 100
 uint8_t bytesData[ARRAY_SIZE_BYTES];
-#define ARRAY_SIZE_STRINGS 30000
+#define ARRAY_SIZE_STRINGS 100
 uint32_t codepoints[ARRAY_SIZE_STRINGS];
-#define ARRAY_SIZE_STRINGS_ASCII 150
+#define ARRAY_SIZE_STRINGS_ASCII 100
 char charsNamespaceURI[ARRAY_SIZE_STRINGS_ASCII];
 char charsLocalName[ARRAY_SIZE_STRINGS_ASCII];
 
 /* String table memory setup */
 uint16_t numberOfLocalStringsDecode[EXI_MAX_NUMBER_OF_QNAMES];
 uint16_t numberOfLocalStringsEncode[EXI_MAX_NUMBER_OF_QNAMES];
+
+#ifndef NULL
+#define NULL   ((void *) 0)
+#endif
 
 #if EXI_DEBUG == 1
 # define DEBUG_PRINTF(x) printf x