Fix up some tests broken from previous commits, and pre-introduce some changes related to caucase integration