Got the unit tests working again

Overall, not nearly as bad as I'd feared.