slight test refactor to make them more robust