Clean up assertions in test suite

This addresses both `assert_raises` (#235) and `, actual` (#236).