Updates to the DSL.
Updated all server tests to the new DSL.