further improvement plus first successful UnitTest