Separate out UnicodeJS tests properly

Also fix some comment & whitespace inconsistencies.

Change-Id: I71717643678445590820e174e6ed2e5ac58103c2
Merge "Separate out UnicodeJS tests properly"