reorganized map tests