More tests and cleanup.
Replaces 'should' with 'expect' syntax.