Fixing over-retaining, adding tests and fixing blocking on failure to find movies.