aligning test folder to master branch