First cut at restoring itests.