WELD-1651 Add some more tests