Test fixes for next