Modified unit tests, also using US2TextRange now