Extend scenario coverage

With the scenarios added here, I think we now have fairly complete test coverage of the current functionality, aside from the overwrite prompting, which I'm going to change up in the near future anyway (with appropriate scenarios added). Consequently, once this is merged I'm going to close #16.