fix contract test suite infrastructure