Refactored tests to use Domain Specific Languauge