Fix in documentation: repeated costs
Deprecation tests fixes
Deprecation doc fixes