Fix tests (delete depricated method usage)