Added better separation of logic for prompting.  Fixed an error missed by the unit tests due to filename comparisons that ended up being absolute paths when not mocked