Fixed unit test issue