trigger deprecation errors, adjust tests and add TODO comments