Update tests

Fix logic for last test pass
Add map_utils deps