Fixing unit test issue