Tundra hk, incl. improved unit test reliability