Fix test builds