Added some test coverage for issue #16