refactored tests
merge conflict