Fixed some still-broken unit tests