Unit test bug fix1