Improve integration test of map