Re-factored specification to use more DSL matchers.