Issue #168 - Added test cases