refactoring tests and partials.