Add draft dsl for tests
Fix warnings