get regression test running with refactor, test more features