Fixed Tests Failure Issue