Fixed test typos.
Fixed tag mapping methods.