Added tests for issue #58