Try to fix #4626, #4630 (start with failing tests)

Try to fix #4626, #4630 (start with failing tests) #724