Also made a restriction test more reliable. Also renamed restrictionstest to entitypermissionstest to be more consistent with newer app wording.