Added tests for issue #16