fix regression test bugs