porting old tests
porting old tests