Debug tests
(cherry picked from commit f71cb469a908ad7483c05d3d5f6415da491290d7)