Move TMDB to own file
Rearrange tests