Fixing Unittest