Some changes on unit tests