Collections unit tests along with some minor cleanup.
Need to get sourceUrl path handling for videos out of views.