Fix unit test case for #358