Fix regress tests