2f481ee10c
* Update tests to account for non-backported deprecations
* remove comment spacing
(cherry picked from commit 30f5d62bf5)