making tests logic work again
resolved all remaining warning about plugin structure changing