various improvements while porting Mirebalais smoke tests