Moved old @UnitTest to @UnitTestOLD
Work on version 2 of @UnitTest