Unit test issue fixed