cherry pick changes to movie_library_spec.rb