More functional test porting