Issue #16 - Updated test cases.