Added start of test porting