Refactoring tests - make them faster.