added tests and enabled public/private of a map
Merge branch 'guhuyue'