SIFD-6 simplified mets structmap model and changed spec test accordingly