Fix up tests for new permission scheme