refactoring testing data creation and added new test