Update docs, fix tests
Add @deprecated note