Remove deprecations

Also, expand test coverage.