Added tests and did fixes for field type embeddedmap