rebase and adjusting new regression test files