porting tests from master...