Refactored Test - Model