Test fixes to work with new changes.