First shot in refactoring tests