Implement a few improvements suggested by review:

1) Roll the tests into a better description rather than using comments.

2) Reduce code repetition by way of include? test, cast, then send().