Fixed contrib tests after #367 patch.