Fix test breakage from last commit
Pull in deletion queue tests into master