Name snapshots based on the type of schedule

Add support for naming imagess appropriately depending on if
the schedule is for a daily or a weekly snapshot.

Removed a couple of functional tests that weren't really functional and were redundant with similar unit tests.
Hmmm - I can't remember even putting that there. PyCharm may have done it automatically when I did an extract method operation - it likes making things static when it can. I can take it or leave it myself - is there a reason or convention not to use it? (Just curious - I don't mind taking it out.)