merged tests and test folder