#786 Changed some unittests to plugin style