Fix Test issues