Tidy up main tests

Will also be split out when refactoring the other methods
(movie/person/etc)
Add missing property
Fix wrapper for keywords
Fix wrapper for keywords