Fixing the Unittests