Cleanup test to fix #3738