Renamed test dir, added nested plugin.xml