More map test changes