Fix test cases in SemanticMaps as well ala I95c0e0c28

Change-Id: Iddf838eec7091f7563c79908c0477a4a3f3789ec