more custom mapping id tests
test fixes