Test passing, refactored moviestorage