Movie quick fixes and some test fixes.
Extended Country and Language.