Fixed more unit tests I broke