merge tests from original repo