Refresh of test suite

More fine grained test definitions.
Use expect instead of assert.

Signed-off-by: John McCutchan <john@johnmccutchan.com>