defined roles
removed file, created in trusted
some corrections
new unit tests