renamed to UnitTest.py, bug fixes so DtD runs