Some security tweaks for passed data.
Re-committed some files after they were accidently deleted from cleaner plugin tests.