A few tests missed the SpriteBatch->Batch interface shenanigans.