minor change
changed plugins mechanism to be declared in a context of a catalog.
minor change.
changed tests because underlying plugin mechanism takes catalog into account.