Refactored end to end test to use a DSL-like execution.