Updated test map