Split Application DSL in 2
Fix tests