update for changes in test-contrib