More tests and more porting