Fix DSL/mock specs up to run, reveals a number of SWT failures though...
Merge pull request #2 from PragTob/mad_flow

Fix DSL/mock specs up to run, reveals a number of SWT failures though...