Fixed map tests