FIx a bunch more unit tests