small size and test refactor.