refactoring on tests, before added