Addressed review comments and added test cases for Defect fix: MAGN-1380 - Add tests for files from the future