Made the UnitTest class static and fixed some comments.