#723 - Added tests