Issue #130 - Added new tests