fix demo, map unit test