Added content access rights
Refactored tests