[#1210] Add decorators to the plugins toolkit
[#1210] Yet more tests fixes