Simplified and made test more readable