Added some UnitTest variables.
Push before continuing work.