enhanced concurrent map test; and moved it to collection test