Issue #452 Added tests