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.
Actually this was something I put in when I was trying to debug something. Didn't mean to leave that log line in. :-P