Tweak tests to make them a little more robust, improve name of media items.