Remove "then" from test suite

This removes the "then" keyword from the test suite.  Andrew did this
once before, but some new ones crept in.

This also adds braces to the "if" conditions and normalizes the
failures to just use "return".


9 files changed