Test refactoring
Further file splitting