Improve movie_finder tests and make movie detection more general