refactored tests
refactored tests