Fixed a few unit tests