Changes according to tests