MODE-1802 - Updated as per code review, moved and added a test case to FileSystemConnectorTest.