fixed regression test  issues