Issue #116 -  Tests