Fixing some additional tests that were broken by my changes.