Add some tests for node access permissions.
Fix merge conflicts in waggle.info