Improve tests adding the new test infrastructure as in plugin builder

see above