Refactored Tests
Refactored tests
Refactor