Fixing bug found in unit test - Issue #8