Merge "Overrides permission check in tests to fix failing unit tests"