Refactored tests
Refactored tests