further unit test porting from old repo