Fix compile issues in other tests