more refactoring now in test folder