Refactored Test