Refactoring tests out to several files