changed test folder structure