more test refactor.