Fixed the Unittests