added test support, migrated to new plugin