TS-3006 fix regression again.  Must propagate constants into test. This close #119