Fixed a few more unit tests