porting more tests