Fixed a few unittests