SUP-959 #comment More Fixes and tests