id_type fixes for unit tests