Update mapping unit tests and covered code