Refactor data_map_tests to use new matchers...