Test fixes for recent changes