Fix some more unit tests