Improve testing of untyped value handlign