Added Safe and Hazardous Map Types.  Existing test cases were changed just to allow building process.  Go through test cases again.