refactoring and more test