Fixed unit test for Issue #651