rebase and adjust to new regression test files