Rewriting the ModelCoverage-stuff, preparing for FRView-test