Fixed a couple unit tests