Added tests issue #6