Merge "Update idmap2_tests to really work host-side"