minor changes to go with test refactor and improvement