Fix remove_rights test, add comments