Fix System.Data test cases