@UnitTest: various additions for auto-publishing