Issue #291: Updates Unit Test