Some changes with tests