Add some additional tests.

Some comments would be welcome.