#727 - Added tests