fix broken unittests in distrib