Updated tests to new custom mapping format