Test Refactored