Fix the test build

Update usage of a few deprecated items