Added tests for issue 95