Add the plugin directory and added some more tests.