Updated tag_map for base assertions
Added tests