Restore original UnitTest and Gwen