Tests and fix for WELD-1766