Adding some tests for ticket #16.