Refactor file directories in test folder