New safemap and hazardous map tests