diff --git a/test/map_codec_tests.erl b/test/map_codec_tests.erl
new file mode 100644
index 0000000..96460bc
--- /dev/null
+++ b/test/map_codec_tests.erl
@@ -0,0 +1,34 @@
+-module(map_codec_tests).
+-author('Harald Welte <laforge@gnumonks.org>').
+
+-include_lib("eunit/include/eunit.hrl").
+
+-include("map.hrl").
+-include_lib("osmo_ss7/include/isup.hrl").
+
+-define(TCAP_MSG_BIN, <<100,65,73,4,81,1,2,200,107,42,40,40,6,7,0,17,134,5,1,1,1,160,29,97,27,128,2,7,128,161,9,6,7,4,0,0,1,0,1,3,162,3,2,1,0,163,5,161,3,2,1,0,108,13,163,11,2,1,64,2,1,8,48,3,10,1,0>>).
+-define(TCAP_MSG_DEC, {'end',{'MapSpecificPDUs_end',[81,1,2,200],{'EXTERNAL',{syntax,{0,0,17,773,1,1,1}},asn1_NOVALUE,[97,27,128,2,7,128,161,9,6,7,4,0,0,1,0,1,3,162,3,2,1,0,163,5,161,3,2,1,0]},[{basicROS,{returnError,{'MapSpecificPDUs_end_components_SEQOF_basicROS_returnError',{present,64},{local,8},{'RoamingNotAllowedParam',plmnRoamingNotAllowed,asn1_NOVALUE}}}}]}}).
+
+parse_test() ->
+	?assertEqual(?TCAP_MSG_DEC, map_codec:parse_tcap_msg(?TCAP_MSG_BIN)).
+encode_test() ->
+	?assertEqual(?TCAP_MSG_BIN, map_codec:encode_tcap_msg(?TCAP_MSG_DEC)).
+
+-define(ADDR_DEC, #party_number{nature_of_addr_ind = ?ISUP_ADDR_NAT_INTERNATIONAL,
+				internal_net_num = undefined,
+				number_incompl_ind = undefined,
+				numbering_plan = 0,
+				present_restrict = undefined,
+				screening_ind = undefined,
+				phone_number = [1,2,3,4,5,6,7,8,9,0]}).
+-define(ADDR_LIST, [144,33,67,101,135,9]).
+
+encode_addr_list_test() ->
+	?assertEqual(?ADDR_LIST, map_codec:encode_addr_string(?ADDR_DEC)).
+encode_addr_int_test() ->
+	AddrDec = ?ADDR_DEC,
+	?assertEqual(?ADDR_LIST, map_codec:encode_addr_string(AddrDec#party_number{phone_number=1234567890})).
+decode_addr_list_test() ->
+	?assertEqual(?ADDR_DEC, map_codec:parse_addr_string(?ADDR_LIST)).
+decode_addr_bin_test() ->
+	?assertEqual(?ADDR_DEC, map_codec:parse_addr_string(list_to_binary(?ADDR_LIST))).