test files merged into test folder