plugin tests fixed
and some other tests fixed