More test compilation fixes