Fix Test cases