move to unified test support

now tests have reasonable timeouts. We can see that
the signature tests fail. Oops