Fixed reversion: now including mixin info as rdf:type again
Added unit test for inclusion of RDF type triples from mixins