Made folder and file tests pass. Moving on up to image class refactoring.