Added more edge case testing and implementation for imdb discovery