Correct deprecated calls in test suite