Refactoring, multichunk test