DATAGRAPH-458, DATAGRAPH-460 : Added some tests