BUG: fix various tests issues preventing running under haas