Refactoring tests....