Allow fix-tst to build

This is yet another hack, but at least things build!