Actually fix the tests by removing disposition

This doesn't really have any relevance to whether things are
public/private or not, and it's complicated by the image/document switch
in the logic.