Separate mapping, update unit test to load data.