Remove unused imports
Improve test DSL