Fix Test Issues