Refactoring to tests DSL