#737 - Added tests