Rebase of unit test fixes

I fixed the rebase issue that the astyle changes made to your unit test updates.  If you land this, it should go in smooth.

UPDATE: there are some issues with building one of the tests:

````
cilanguage_unittest.cpp: In member function ?@Xvirtual void CueIdLanguage_DISABLED_LongStringKorean_Test::TestBody()?@Y:
cilanguage_unittest.cpp:273: error: \u0012 is not a valid universal character
````