Extended upstream Stash tests for use by Service/Item