Various test and OMEModel cleanup