trying to make tests robust