Use consistent test data format
Add test for returning unmapped integer as data