Fixing up slideshow based on tests