Changes on unit test