Adding all new changes to tests