slight cleanup of fileLocationCalculator
clean up file location calculator logic and tests