tests refactore in order not to use deprecated code