Added unit test for #329
Added missing trailing ; on surrogate unicode thing stuff
Fixed for mac unit test passing