Renamed samples int test.
Removed plugin ids for some native plugins that are not public yet.
Fix for merge problem.