Add tests form new changes