Enhancing FilterAndMapTest.java