Fixed message generation and cleaned up DSL (aSucceed -> succeed, aFailure -> fail) + additional tests