Fix to pass tests
Add imdb associations
Tuned up