Cleanup warnings and add test for issue 57290
3 files changed