Adding tests to fix ticket #16.