Addition of test for map