More test case porting.