Remove deprecated methods; fix tests