- Suppress -enumco option, instead get info from model source file
- Add a observed location field to test structure (cf. test.ml) as
  this information is computed in several places.