remove deprecated method & update tests