Add additional tests.

2017-09-20, Eric Fritz