Add test for map support