WIP. Test fixes.